Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 3 Jul 2011 05:25:35 +0000 (22:25 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 3 Jul 2011 05:25:35 +0000 (22:25 -0700)
commit367701e7ccef4d253701555072bdc37e7f01b172
tree5fb4c995e20313b56eb669537b5d9b8d1167b194
parentca897a2a5a6e40ddf200e14ebff2bc7ed4289422
parentbe8b962629323663da6f126feb36abcabb6dabe3
Merge from trunk.